Skip to content
This repository has been archived by the owner on Jul 24, 2024. It is now read-only.

re #2613 Apicurio Integration #2886

Merged
merged 23 commits into from
Jul 16, 2018
Merged

re #2613 Apicurio Integration #2886

merged 23 commits into from
Jul 16, 2018

Conversation

kahboom
Copy link
Contributor

@kahboom kahboom commented Jun 25, 2018

@kahboom kahboom added the pr/wip Mark work-in-progress with this label. pure-bot won't merge a PR if this is set. label Jun 25, 2018
@gashcrumb
Copy link
Contributor

Kewl, will take a look tomorrow @kahboom

@gashcrumb gashcrumb self-assigned this Jun 25, 2018
@gashcrumb
Copy link
Contributor

Turns out you have to read the file locally too, doesn't appear to actually be in the response back from posting it. Once that's sorted:

capture

@gashcrumb
Copy link
Contributor

Mind you, click on anything and you'll see loads of error messages, so there's definitely still work to be done.

@kahboom
Copy link
Contributor Author

kahboom commented Jul 6, 2018

Just an update--there has been a lot put on hold since the Angular 6 upgrade. I've spent quite some time trying to sort out some issues mentioned here, also have a branch to test Apicurio embedding with Angular 6 here: https://github.com/Apicurio/apicurio-angular-demo/tree/angular-6

Seems there is an issue with ng-packagr and likely my configuration settings.

screenshot 2018-07-06 10 35 17

Was hoping to ensure 6.x compatibility and that it might take care of the original Yaml.js issue, but it's taking more time than it's worth, so I'll focus on resolving the issue with Angular 5.x first.

@gashcrumb
Copy link
Contributor

Yep, makes sense! Looks like you need to rebase this PR and do push -f as seems to have picked up lots of other commits from master, but probably best to focus on debugging the issue with the sidebar in the example app first and get that sorted.

We'll definitely also need to ensure Angular 6.x compatibility though, with that comes some possible rxjs migration. You might want to have a chat with @seanforyou23 on that, he did all the migration work for Syndesis and can probably point you in the right direction for apicurio.

@kahboom
Copy link
Contributor Author

kahboom commented Jul 9, 2018

@gashcrumb - Right, I was seeing that! Looks like compatibility with Angular 6 won't be a problem, I've set up a branch to test a few things and it actually looks like it solves some other issues. So I'll focus on 5 and think 6 won't be a major problem, but of course, you never know..

@kahboom
Copy link
Contributor Author

kahboom commented Jul 9, 2018

Actually, on rebasing I do bring in Angular 6, so I'll work within the Apicurio Angular Demo for now and sort out this issue later.. may make more sense to close this PR and re-open when ready.

@kahboom kahboom closed this Jul 9, 2018
@kahboom kahboom reopened this Jul 13, 2018
@kahboom
Copy link
Contributor Author

kahboom commented Jul 13, 2018

@gashcrumb - Had to create a window service to deal with the hacky solution in a slightly better manner. I am still running into an error that looks pretty familiar, but I can't tell if it was something that happened during the huge rebase.

By the way, apologies for the duplicated commits. I need to rebase more frequently and can squash all the duplicates if you'd prefer.

screenshot 2018-07-13 01 30 01

FYI this appears to be working fine now in the Apicurio-Angular-Demo app with the new window service. cc @paoloantinori

@gashcrumb
Copy link
Contributor

Think you just need to do push -f after you do your rebase.

The error is complaining about this line -> https://github.com/syndesisio/syndesis/pull/2886/files#diff-b25c2fa263e6ff5b15a5e499f0e2f2a8R72

Is that property exposed as an input by the api-editor component?

@paoloantinori
Copy link
Contributor

Careful with push -f and let's try to avoid it as much as possible! 👹

@gashcrumb
Copy link
Contributor

@paoloantinori that's mostly a concern for shared branches by an entire team, not so much PR branches. When squashing commits on a PR where the commits have been published, a forced push is required.

@kahboom
Copy link
Contributor Author

kahboom commented Jul 13, 2018

I also squashed the first commit by mistake, which created some issues. 🙈 Next time will try to have a cleaner PR and rebase more frequently.

UPDATE:
Although in the demo app it is working without issues, when importing into Syndesis (which uses a different ngx-bootstrap version and Angular 6) there are some other errors that need to be ironed out.

@gashcrumb has kindly been trying to help sort this out, but a little bit more time will be needed for the toolbar issue and apparently some local issues (server errors related to the Minishift instance) I'm having that prevented me from creating a proper demo in time.

@kahboom kahboom changed the title WIP - re #2613 Apicurio Integration re #2613 Apicurio Integration Jul 16, 2018
@kahboom kahboom removed the pr/wip Mark work-in-progress with this label. pure-bot won't merge a PR if this is set. label Jul 16, 2018
@kahboom
Copy link
Contributor Author

kahboom commented Jul 16, 2018

cc @paoloantinori - Sorry for the git mess; this is missing the toolbar and the user won't be able to complete the flow as expected, but we can still get this merged in if you'd like and I can sort out the toolbar issue tomorrow? Your call.

@paoloantinori
Copy link
Contributor

Hi Rachel, github says that there are conflicts to resolve:

Conflicting files
app/ui/package.json

Can you fix them with a further commit?

kahboom and others added 17 commits July 16, 2018 11:05
This update contains:
* Gap control for separate/combine index (atlasmap/atlasmap#449)
* A prototype of data preview mode for single mapping (atlasmap/atlasmap#451)
Upgrades angular core to version 6
Upgrades patternfly
Upgrades ngx-bootstrap
Upgrades node version
Adds rxjs-tslint
Adds rxjs-compat (solves issues with ngx-bootstrap)
Applies consistant code formatting and new formatting rules
Adds new script for linting typescript files
Removes unused imports
preserve-symlinks flag moved to angular config json
The following vulnerabilities are fixed with a Snyk patch:
- https://snyk.io/vuln/npm:tunnel-agent:20170305

Res merge conflicts in package.json

Add Apicurio references to ApiConnectorModule

Add fnx to ApiConnectorCreateComponent

Display editor only on submitting step 2

Pass param via EventEmitter to determine whether or not ot hide or show the definition editor

Styling for Review btn, minor changes

chore: read swagger document locally and pass to api editor

Res merge conflicts
Res merge conflicts in package.json

Add Apicurio references to ApiConnectorModule

Add Apicurio references to ApiConnectorCreateComponent

Add temporary API definition in constructor

Add fnx to ApiConnectorCreateComponent

Add selector, reference fnx in template

Display editor only on submitting step 2

Show or hide editor

Pass param via EventEmitter to determine whether or not ot hide or show the definition editor

Hide Step 2 to display editor

Add reference to existing specification file uploaded

Add header for template

Cleanup

Styling for Review btn, minor changes

chore: read swagger document locally and pass to api editor

update to patternfly 3.51.2

chore: Update to AtlasMap 1.35.4

This update contains:
* Gap control for separate/combine index (atlasmap/atlasmap#449)
* A prototype of data preview mode for single mapping (atlasmap/atlasmap#451)

chore(deps): upgrade angular core and rxjs

Upgrades angular core to version 6
Upgrades patternfly
Upgrades ngx-bootstrap
Upgrades node version
Adds rxjs-tslint
Adds rxjs-compat (solves issues with ngx-bootstrap)
Applies consistant code formatting and new formatting rules
Adds new script for linting typescript files
Removes unused imports
preserve-symlinks flag moved to angular config json

chore: upgrade to patternfly-ng 4.x (partial)

fix: app/ui/.snyk & app/ui/package.json to reduce vulnerabilities

The following vulnerabilities are fixed with a Snyk patch:
- https://snyk.io/vuln/npm:tunnel-agent:20170305

Res merge conflicts in package.json

Add Apicurio references to ApiConnectorModule

Add fnx to ApiConnectorCreateComponent

Display editor only on submitting step 2

Pass param via EventEmitter to determine whether or not ot hide or show the definition editor

Cleanup

chore: read swagger document locally and pass to api editor

Res merge conflicts

Minor changes

Fix for Angular 6 upgrade with CLI 7 causing fs not found for yamljs

Moving polyfills to polyfills file

Moving shims to shims file

Rm postinstall script
Minor changes to package.json
@kahboom
Copy link
Contributor Author

kahboom commented Jul 16, 2018

@paoloantinori - I resolved the conflicts this morning and squashed some duplicate commits to clean up the history a bit. Are you okay with me proceeding to merge it?

@kahboom kahboom merged commit c3b4756 into syndesisio:master Jul 16, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants